Remove conflict marker.
authorMichael Natterer <mitch@src.gnome.org>
Wed, 14 Nov 2007 09:45:59 +0000 (09:45 +0000)
committerMichael Natterer <mitch@src.gnome.org>
Wed, 14 Nov 2007 09:45:59 +0000 (09:45 +0000)
commitb4327f13ed59eab3e8e45c9ae7cf9283634991da
tree661293744f748f8c88946a6db8e411bf792f089b
parent24a6e04cb28545b481e5fed4093347987482a632
Remove conflict marker.

svn path=/trunk/; revision=18989
ChangeLog